From: Florian Müllner <fmuellner@gnome.org>
Date: Tue, 17 Mar 2015 01:36:05 +0000 (+0100)
Subject: telepathyClient: Don't remove body on updates
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1456
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=0ee762263afb233ef875709d6f64805c54c84dce;p=gnome-shell.git

telepathyClient: Don't remove body on updates

Passing null as body always meant clearing the existing one. While this
mattered less with the old message tray which used the expanded actor,
the new message list in the calendar uses the unexpanded body. We clearly
don't want that to disappear on icon changes, so pass the existing one.

https://bugzilla.gnome.org/show_bug.cgi?id=746343
---

diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index d552488b8..ddcddfe4b 100644
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -352,7 +352,9 @@ const ChatSource = new Lang.Class({
 
     _updateAvatarIcon: function() {
         this.iconUpdated();
-        this._notification.update(this._notification.title, null, { customContent: true });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { gicon: this.getIcon(), customContent: true });
     },
 
     open: function() {
@@ -546,7 +548,9 @@ const ChatSource = new Lang.Class({
     },
 
     _presenceChanged: function (contact, presence, status, message) {
-        this._notification.update(this._notification.title, null, { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
+        this._notification.update(this._notification.title,
+                                  this._notification.bannerBodyText,
+                                  { customContent: true, secondaryGIcon: this.getSecondaryIcon() });
     },
 
     _pendingRemoved: function(channel, message) {